Some UI tweaks, still not good or even perfect but will do for testing purpose