Finalized some UI stuff