Updated App UI