Layout fix
New template
Updated android