Cleanup - Work section - misc

- Cleanup and changed direction on some layout
- Finished work section