#some layout repairs