A04 & A05: Submit completed and make minor fixes

Commit A05 complete and change some layout properties of A04