Fixed more minor errors to layout