Cleaned up code, updates to use 4 column layout.