Fixed Layout and Project Bugs