css and some source-pics were added, some refactoring