Fixed imports, renamed layout and updated import order and comments