Added some style and few small fixes