Final changes

Design changes to final project