working on wray's layout