Issues #6 and #7 corrected.
UI Layout changes to Entry Screen.