some styles and header adjusted to lower resolution
changes of merge commited