Cleaned up code. Removed unused imports. Renamed images.
Resolved merge conflice in main xml