UI fixing and stuffs