Adjusted formating and column layout a bit