UI Functionality Complete

Just need to complete the UI features now.