Some layout and messing around with angular.