Add in testing icon and adjust layout