Finished modularizing, fixed bug with displaying labels