Added lines and change the LookAndFeel for compatibility on MAC