Basic functions work now some layout changes