Design update and some fixes
Added some inputs, template changes
catch PDOException