Fixes buttons and lists