Merged all views to scrollview & fixed other layouts issues