Fixed some positioning and changed title