Fixed minor errors to layout