Merge "Fixing layout button in caption and adding quarter functionality"