Reworking UI: Looks slightly better now