Only get current week, UI improvements