2 Layout/style Fixes