UI Changes

Corrected UI to be consistent with Jacky. Uploaded original pencil
documents incase further changes needed.