Added welcomepage and subject select