Wam theme tweaks

Hi guys these are the changes to fixe the issues #127, #126, #125 and #130. plus a few extra styling bits and pieces