cleanup
added macro for configuring main layout