fixed a bumch of layout issues