metro bugfixing and layout fixes