Fixed graphical disign issues