Clean up + Worked on UI