Finalizing...

Looks like the initial stage of development has drawn to an end
Minor Fixes

Fixed the class row