Full application - WORKING FIXED BUGS