Updated CAP calculator layout