Minor code and views html clean up

Minor changes to the code. Mostly changes in the views and translations.