bugfixing ui :)