Updated and finalized the UI