Working on Sidebar and UI