month/year filtering and layout fix