changed layout of entries, changed calendar colors to match color scheme