Added LinearLayout, substitute for other layouts
Removed unncessary layouts
Updated widgets to use LinearLayout instead of old layouts