Initial revision
Look&feel changes