deleted test, added fixes for some layout