Small fixes
Permission and layout fix
Layout fixes