Trying to fix issues with overlapping buttons... merging... 
Trying to fix issues with overlapping buttons... merging... 
mbjornas3/AGORA,mbjornas3/AGORA,MichaelHoffmann/AGORA,MichaelHoffmann/AGORA,MichaelHoffmann/AGORA