Finished styling all buttons and main splash page before you login. Need to finish main page once logged in with progress bar and other text.
fixed merge conflicts and updated settings page to have a trash can