Fixed more layout issues. Works much better now