Random fixes/ UI improvements