Fixed some layout issues, removed mvp2 features