Fixed Current -> Week mapping
Tweaked alignment of user picks
Adding in themes