Changed layout slightly to fit to page