Simplify CSS and templates for back/ok buttons
Rename add machine view to fix image listing