Simplify some layout css and adjust sidebar