added Menu and more positioning edits