Finishing touches on the UI