Updated for new layout

Works slightly not as terribly