move aside into its own include (clean up about layout)