Made some layout tweaks. Added more comments.