Adding more code for making ui a bit more good