UI reworked, multiple fixes