improving layout slightly