[UPDATE] couple of layout changes, add combo page