Lotsa edits and some styling