#19 Refined name positions of elements
#19 Cleaned up positioning portion of code
#19 Cleaned up AD decor code and refined positions