Layout fixes and working out how to do styling