Manually merging (conflict was because of broken code that was pushed luls sorry), adding updated UI