Better responsive layout, general cleanup