Scale the image on main activity better
Remove unused includes
Added discNumber parsing