Added system highlight, fixed some layouts to be more dynamic