Improve stylesheet and Fixed #2