added new entries and finished
fixed css and merge for new entries