Added webpage functionality and cleaned up class organization