Refactor linearLayout (broken), fix small things overall