Fix bugs and positioning issues