fixes #99 
Some css refactor and layout optimization