Fix positioning/resizing problems in prev. commit + cleanups