Added more color to the layout
Fix for bubble adjustment