Minor layout changes. Better practices implemented.