Merge pull request #71 from alex-deaconu/master

[chore] Split out layout and arrow loading functionality