Bunch of changes. Trying a cleaner layout.