Some fixes on CSS layout