Layout and addmedication changes