moving things around
using layout for index