Design update
Added Catcha for camelcase version and numbered version
Design and templates update mostly