Added view classes for presentation layer
Added icons in menu back
Moved some variables out of global space