Finishing touches on basic layout