removed not used variables
Removed unused variables
Replaces entire code with new version - styling etc