more id's added and link buttons changed to actual buttons