First round style/UX fixing according to :ofeng