Layout fixes done, program is complete