Formated code and started working on UI