Fixed major layout issues