Updated to new fancy layout (alabaster)