Fixed some view issues and button alignment