Fixing styling issues and changing super class