UI Additions & Unfinished Changes

Added some UI refinements & space for new features to be implemented. No
functionality ready yet.