Moved actions to object from array
Fixed bugs with layout