Added back button
Added manual entry screen