Changed some layouts
removed serializable