Updated with bash layout