fixing layout issue - mostly alignment