Fix ignore .layout, clean up style in Main