moved more logic to stylesheet
usability improved