Grid layout prettied up a bit!

Will still rename some of the activities...