Renaming
Base inputs
Init render removed and view tidy up